Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 15:49:15 +0000 (07:49 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 15:49:15 +0000 (07:49 -0800)
commit782d5d53f52ac6320d5e03660e8ac175936a2b2c
tree2d2349b3c08ab3052cdcb1139b8776168fca0c0f
parentf5198b38ffdc6b7a9cd7c87af56e164549046a95
parent5db6761412b998ce22b64aaaa7f6b3def43efc31
Merge from trunk.